Skip to content

Conversation

@philiptaron
Copy link
Contributor

@philiptaron philiptaron commented Jan 8, 2026

This PR targets staging-nixos due to needing to rebuild all NixOS tests.

Small changelog:

Bug fixes (crashes)

Bug fixes (functionality)

Bug fixes (output)

Improvements

Build system

https://github.com/NixOS/nix/releases/tag/2.31.3

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

@nixpkgs-ci nixpkgs-ci bot added 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jan 8, 2026
@philiptaron
Copy link
Contributor Author

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 478158 --additional-package nixVersions.nix_2_31.tests
Commit: beb32637eeac2a48dffa119905b6ca550c69df43


x86_64-linux

⏩ 1 package marked as broken and skipped:
  • tests.pkg-config.defaultPkgConfigPackages.tests-combined
⏩ 2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
❌ 2 packages failed to build:
  • python314Packages.nixpkgs-updaters-library
  • python314Packages.nixpkgs-updaters-library.dist
✅ 1 test built:
  • nixosTests.simple
✅ 172 packages built:
  • appvm
  • bundix
  • cabal2nix
  • cached-nix-shell
  • chirpstack-concentratord
  • colmena
  • comma
  • common-updater-scripts
  • corto
  • crate2nix
  • crush
  • dhall-nix
  • dhall-nixpkgs
  • disko
  • dub-to-nix
  • dydisnix
  • fusionInventory
  • gcalcli
  • gcalcli.dist
  • gclient2nix
  • glpi-agent
  • haskellPackages.cabal2nix-unstable
  • haskellPackages.cabal2nix-unstable.bin
  • haskellPackages.cabal2nix-unstable.doc
  • haskellPackages.cli-nix
  • haskellPackages.cli-nix.doc
  • haskellPackages.dhall-nix
  • haskellPackages.dhall-nix.doc
  • haskellPackages.dhall-nixpkgs
  • haskellPackages.dhall-nixpkgs.doc
  • haskellPackages.distribution-nixpkgs-unstable
  • haskellPackages.distribution-nixpkgs-unstable.data
  • haskellPackages.distribution-nixpkgs-unstable.doc
  • haskellPackages.hnix
  • haskellPackages.hnix.doc
  • haskellPackages.language-nix-unstable
  • haskellPackages.language-nix-unstable.doc
  • haskellPackages.niv
  • haskellPackages.niv.bin
  • haskellPackages.niv.data
  • haskellPackages.niv.doc
  • haskellPackages.nix-paths
  • haskellPackages.nix-paths.doc
  • haskellPackages.nix-thunk
  • haskellPackages.nix-thunk.doc
  • haskellPackages.nvfetcher
  • haskellPackages.nvfetcher.doc
  • haskellPackages.update-nix-fetchgit
  • haskellPackages.update-nix-fetchgit.doc
  • home-manager
  • kcl
  • libnixxml
  • lixPackageSets.git.nix-init
  • lixPackageSets.latest.nix-init (lixPackageSets.lix_2_94.nix-init)
  • lixPackageSets.stable.nix-init (lixPackageSets.lix_2_93.nix-init)
  • localtunnel
  • lua51Packages.luarocks-nix
  • luarocks-nix (luaPackages.luarocks-nix)
  • lua53Packages.luarocks-nix
  • lua54Packages.luarocks-nix
  • luajitPackages.luarocks-nix
  • luarocks-packages-updater
  • luarocks-packages-updater.dist
  • lux-cli
  • mdwatch
  • meshlab
  • mlv-app
  • nil
  • nim_lk
  • niv (niv.bin, niv.data)
  • nix (nixVersions.nix_2_31, nixVersions.stable)
  • nix-bundle
  • nix-direnv
  • nix-forecast
  • nix-index
  • nix-init
  • nix-pin
  • nix-prefetch
  • nix-prefetch-docker
  • nix-prefetch-github (python313Packages.nix-prefetch-github)
  • nix-prefetch-github.dist (python313Packages.nix-prefetch-github.dist)
  • nix-prefetch-github.man (python313Packages.nix-prefetch-github.man)
  • nix-required-mounts
  • nix-required-mounts.dist
  • nix-serve
  • nix-template
  • nix-update
  • nix-update.dist
  • nix-visualize
  • nix-visualize.dist
  • nix-web
  • nix.dev (nixVersions.nix_2_31.dev, nixVersions.stable.dev)
  • nix.doc (nixVersions.nix_2_31.doc, nixVersions.stable.doc)
  • nix.man (nixVersions.nix_2_31.man, nixVersions.stable.man)
  • nixStatic
  • nixStatic.dev
  • nixStatic.doc
  • nixStatic.man
  • nixVersions.nix_2_31.tests.misc
  • nixVersions.nix_2_31.tests.nixi686
  • nixVersions.nix_2_31.tests.nixi686.dev
  • nixVersions.nix_2_31.tests.nixi686.doc
  • nixVersions.nix_2_31.tests.nixi686.man
  • nixVersions.nix_2_31.tests.nixpkgs-lib
  • nixVersions.nix_2_31.tests.pkg-config
  • nixVersions.nix_2_31.tests.simpleUefiSystemdBoot
  • nixVersions.nix_2_31.tests.srcVersion
  • nixVersions.nix_2_31.tests.upgrade
  • nixci
  • nixos-anywhere
  • nixos-generators
  • nixos-option
  • nixos-rebuild-ng
  • nixos-rebuild-ng.dist
  • nixos-shell
  • nixpkgs-hammering
  • nixpkgs-manual
  • nixpkgs-review
  • nixpkgs-review.dist
  • nixpkgs-reviewFull
  • nixpkgs-reviewFull.dist
  • nixseparatedebuginfod2
  • nixtract
  • node2nix (nodePackages.node2nix)
  • nodePackages_latest.node2nix
  • nps
  • nuget-to-json
  • nurl
  • nvfetcher
  • python313Packages.nix-kernel
  • python313Packages.nix-kernel.dist
  • python313Packages.nixpkgs-updaters-library
  • python313Packages.nixpkgs-updaters-library.dist
  • python313Packages.pymeshlab
  • python314Packages.nix-kernel
  • python314Packages.nix-kernel.dist
  • python314Packages.nix-prefetch-github
  • python314Packages.nix-prefetch-github.dist
  • python314Packages.nix-prefetch-github.man
  • python314Packages.pymeshlab
  • ragenix
  • sbomnix
  • sbomnix.dist
  • sus-compiler
  • swiftpm2nix (swiftPackages.swiftpm2nix)
  • terranix
  • tests.devShellTools.nixos
  • tests.dhall.generateDhallDirectoryPackage
  • tests.fetchgit.cached-prefetch-avoids-fetch
  • tests.fetchgit.prefetch-git-no-add-path
  • tests.pkg-config.defaultPkgConfigPackages.nix-cmd
  • tests.pkg-config.defaultPkgConfigPackages.nix-expr
  • tests.pkg-config.defaultPkgConfigPackages.nix-main
  • tests.pkg-config.defaultPkgConfigPackages.nix-store
  • tests.pkgs-lib.formats
  • tests.pkgs-lib.formats-tests
  • tests.testers.lycheeLinkCheck.network
  • tests.testers.nixosTest-example
  • tests.testers.runNixOSTest-example (tests.testers.runNixOSTest-extendNixOS)
  • tests.trivial-builders.references
  • update-nix-fetchgit
  • update-python-libraries
  • vclab-nexus
  • vclab-nexus.bin
  • vimPluginsUpdater
  • vulnix
  • vulnix.dist
  • vulnix.doc
  • vulnix.man
  • wp4nix
  • xosd-xft
  • zon2nix

@nixpkgs-ci nixpkgs-ci bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 13, 2026
@xokdvium
Copy link
Contributor

@philiptaron, can you rebase to resolve the merge conflict with the disabled tests?

@philiptaron
Copy link
Contributor Author

One issue: does the release include the offending patch? It appears to do so...

Changelog of fixes:

## Bug fixes (crashes)

- Fix segfaults from `toView()` when compiled with newer nixpkgs (NixOS/nix#14154)
- Fix use-after-move in `DerivationGoal::repairClosure` and `SampleStack` (NixOS/nix#14086)
- Fix assertion failure on partially valid derivation outputs (NixOS/nix#14137)
- Fix `RestrictedStore::addDependency` recursion causing crashes (NixOS/nix#14729)
- Fix crash on flakerefs containing newlines (NixOS/nix#14450)

## Bug fixes (functionality)

- Fix fakeSSH check breaking SSH copies with `user@host` format (NixOS/nix#14150)
- Fix `builtins.dirOf` regression from Nix 2.23 (NixOS/nix#14515)
- Restore missing `isAllowed` check in `ChrootLinuxDerivationBuilder` (NixOS/nix#14531)
- Fix curl with c-ares failing to resolve DNS in sandbox on macOS (NixOS/nix#14792)
- Fix tarball percent decoding for `file://` URIs (NixOS/nix#14729)
- `exportReferencesGraph`: Handle heterogeneous arrays (NixOS/nix#13861)
- Fix filesystem ops in store optimization (NixOS/nix#14676)

## Bug fixes (output)

- Fix double-quoting of paths in logs (NixOS/nix#14210)
- Include path in world-writable error messages (NixOS/nix#14785)

## Improvements

- Better git refnames validation (NixOS/nix#14253)
- Use pure/restricted eval for help pages (NixOS/nix#14156)
- Improve store-reference compatibility with IPv6 ZoneId literals (NixOS/nix#14134)
- Correct `build-dir` error in manual (NixOS/nix#14745)

## Build system

- Add mdbook 0.5 support (NixOS/nix#14690)
- Drop legacy Apple SDK pattern (NixOS/nix#13976)

https://github.com/NixOS/nix/releases/tag/2.31.3
@nixpkgs-ci nixpkgs-ci bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jan 15, 2026
@xokdvium
Copy link
Contributor

does the release include the offending patch

Only the shebang one, nix-shell would still be flaky (since we can't do much about the rcfile issue)

@philiptaron philiptaron added this pull request to the merge queue Jan 16, 2026
@Ericson2314
Copy link
Member

Side note, we can probably disable the NixOS daemon in most/all NixOS tests. If we do that, can we target master again?

Merged via the queue into NixOS:staging-nixos with commit e971cab Jan 16, 2026
28 of 31 checks passed
@philiptaron philiptaron deleted the nixVersions.nix_2_31 branch January 16, 2026 01:32
@philiptaron
Copy link
Contributor Author

Side note, we can probably disable the NixOS daemon in most/all NixOS tests. If we do that, can we target master again?

Only if the resulting NixOS systems do not include Nix.

@philiptaron philiptaron added 9.needs: port to stable A PR needs a backport to the stable release. backport staging-25.11 Backport PR automatically labels Jan 17, 2026
@nixpkgs-ci
Copy link
Contributor

nixpkgs-ci bot commented Jan 17, 2026

Backport failed for staging-25.11, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin staging-25.11
git worktree add -d .worktree/backport-478158-to-staging-25.11 origin/staging-25.11
cd .worktree/backport-478158-to-staging-25.11
git switch --create backport-478158-to-staging-25.11
git cherry-pick -x a4ef4c189ca6a336cb3e7b7c0e6cc551a6d764c9

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 9.needs: port to stable A PR needs a backport to the stable release. 10.rebuild-darwin: 101-500 This PR causes between 101 and 500 packages to rebuild on Darwin. 10.rebuild-linux: 101-500 This PR causes between 101 and 500 packages to rebuild on Linux. 10.rebuild-nixos-tests This PR causes rebuilds for all NixOS tests and should normally target the staging branches. backport staging-25.11 Backport PR automatically

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants